extract method refactoring, better test error message
polishing