Add tests and new solutions