Adding copyright to serveral test files. Removing more JUnit style matchers.