structural refactor. prettier test setups.