Merged Viraj's checked in and made the test pass.