Add tests for recent challenges #22