Adding surefire tests