Fixing tests and refactoring replay