Both tests complete. Some cleanup