Full refactoring after Jenya review

renaming test methods, adding messages to thrown errors