changing force-sobject structure and adding tests