Added tests, fixed partial