Done cleaning up bounded trace solver tests
More refactoring in progress