build fix; decouple test cases