FIX remove blocking test code