Working on generalizing master activity tests