beef up unit tests