added more tests
added more information to errors
commit just for push