Remove debugging statements
Remove further debugging statements. Refactor tests slightly