Remove debugging
Make the test match the code better