Introduced CommonMatchers class and improved unit test