Remove debug switches and move test class to test folder