Tests for should only allow numbers were missing assertions, sorry.
Merge branch 'better_expiry_formatters' into develop