various refactoring, test editor finalization