some fixes to test construct