moved inner classes to faker package
adds missing unit tests