Some of the tests added for build variant level task generation rely on mocks to test the code. Since the code is multi-threaded this can sometime cause timing issues. There are better ways to validate the code, so we should switch to those.