Merge "Refactors tests and test activity classes"