Rename test class to allow non parametric in the normal test class
Fix findbugs finding: repeated conditional test