Beef up tests