Reverted to JUnit asserts, see #170