Fix failing controller specs
Update regular expression for efficiency