Added tests, now scoring 54/61