Add tests and solutions