Used sholuda-matchers and written new tests