test fixes for new logic