Fix several tests to use correct junit methods