simplified more unit tests