Fix broken skip list test and increase test coverage