1. Cleaned up the tests