most tests back working again after refactor