Updated (simplified) tests