Updated to match the test code