tighten tests and adjust for new logic.