Added Custom Solution to Problem 7 with tests