fix Make test
fix cursor
100% test coverage