allow tests to not fail always: ('@width' and '@height') --> (@width and @height) + clean trail spaces.
allow tests to not fail always: ('@width' and '@height') --> (@width and @height) + clean trail spaces.

git-svn-id: 36dcc065b18e9ace584b1c777eaeefb1d96b1ee8@109427 13f79535-47bb-0310-9956-ffa450edef68

apache/forrest,apache/forrest,apache/forrest,apache/forrest,apache/forrest,apache/forrest