Added more tests - not fully working
Added more tests
Started to add error handlers