Added ActivityTest to tests and added functionality to Activity.