Updated files and tests for interactive version after refactoring.