Added more tests, removed static matches from TokenAuthor (causes issues)