Bounded trace tests are passing now. Cleaning up test file and refactoring