Beefed up unit test