Reduce complexity of assertions module
Clean up long namespaces in matcher test