Add additional tests to problem 7