Added tests and solutions