Added matcher and tests