Added tests and solution file