More extensive tests