Added test folders, feature 1 and 2, expanded replayTrace