switch to JUnit
remove unnecessary case, refactor