added equalToType matcher
removed raw class definitions