Fix and test get and put builders