fixed some syntax errors
Refactor
Refactor
Refactor
Refactolini
Implemented and fixed tests
Added more tests