Refactor
Remove debugging code from tests