KRACOEUS-6913: fixing test by removing bad mappings & associated classes
KRACOEUS-6913: removing commented out code
Merge pull request #8 from leoherbie/master

KRACOEUS-6913: fixing test by removing bad mappings & associated classes