reworded some unit tests