Migrating test code into a test package
Check in refactoring of code for removing Log4J dependencies