Slightly altered folder structure. Added Test to class names to Maven command line runs.