Consolidate Junit tests into one class.