Add support for numeric values in selector attributes and improve test model