Update: added builder and testcase:
Update