remove my change and update the tests