Beefed up Tests a little