FOGT-5: more mapping added and testbuilders