Upload to builder support plus adding some hand tests