Changes to make cursor testing easier.