Refactor tests a bit
Cleanups