Revert "Split loggregator and runtime tests into independent packages"

This reverts commit aa9940632d474a9e1b17c786ddf1bd5fed4b2efc.

* Reverting until we figure out the problem with our jenkins run.