Add special test case
Fix special case bug
Fix some special build cases