Simpler, faster tests