added tests for problem 2, removed 2nd solution as it was stuffed