Fix broken Ryu default dir test.

Also, move Matchers to their own file for moar sharing.

Change-Id: Ia621d0efb633159de4c5c700076e2e778583f8bf
3 files changed