Refactored test files and added old simulator output for testing and validation