Fixed tests
Cleanups