Style fixes
Beautify test formatting
Fix debugger testing