simplified and more readable unit tests