uncommenting tests that should work now