Tests are failing

@sbhatta the tests are failing here; could you please fix it?