Tests refactoring: offline, rename