Changed class names for junit tests