moving remaining tests