fixing issues found from test
Fixed current unit tests failures
reset test folder to prevent any future confusion - done for the day for issue 62