Renames files. Adds the hamcrest matchers to the tests