[BUILD] - Remove bogus tests or merge them into a single run.
Merge pull request #365 from tmorgner/build-clean-tests

[BUILD] - Remove bogus tests or merge them into a single run.