Get rid of JUnit 5 dependency

Change-Id: I56efb38d0c13b801de99b35c040454c33ffa62d1
2 files changed