Remove the variable dependency on JUnit