Removed debugging code; added more tests