Beefed up tests