Modify tests with mixed success