wrapped up tests and final removal of debugging code