Split up tests
Remove debug messages