Modify tests to make them pass