+ tests refactoring, some refs fixes