Remove test skipping and close #368