Minor changes in order to pass tests.