"better" tests (at least more), refactored bits