fix last tests so they pass after last refactor