fixed one test + too many confusing exceptions in tests, removed deprecated junit api usage