Final commit. Fixed errors after running test