Cleaned tests and added clear methods