Refactored junit package