Improved tests
Remove debugging code