Updated code to work with minicluster.  Currently getting runtime exception when minicluster starts
Switched InstaneTypes to Mock to check in.
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
enabled os test again on input format test