Add (skipped) tests for #359