fixes tests to align with new logic