fix tests, remove nextTick stuff