Combine tests and problem 1 into the same module