Added author matching code and tests