bugfix
move transform and validate methods to mapping class
cleanup tests