Add tests to check handling of non-standard tags