fix order of checks
silence some warnings in test suite
Added tag 0.009_02 for changeset d06f9d36b7a0