Moved testing matcher utilities into src/main and under a more
appropriate package name