Add more test coverage for http://jira.codehaus.org/browse/MNG-4565