Problem 7 + Unit Test