Merge pull request #1030 from rillian/PytestUnknownMarkWarning

Fix pytest unknown mark warnings