updated tests to use static imports for hamcrest