Solved problem 65, refactored tests a bit