Passing test with recent changes