Remove the problematic unit tests