more Whitbox tests added