test refactor overhaul