Don't allow null account_id values
Use newer route syntax; add integration test