Cleaned up deprecated JUnit imports.
Merge branch 'DATACASS-14'