Got rid of production classes dependency on JUnit