Added test and solved up to 29