Ensured all tests passing