All view activity jUnits work
Fixed merge conflict again