Added tests to solution