Merge "Convert models to JUnit 5"