reworded test description. add test for error message
merged manuel's commits