CFY-1431 modified class name; fixed import that was changed for tests sake