Test refactoring, persistence and web services ok