Test fix and added MAVEN dependency to the project