beefing up unit tests