add tests for #619, #622

refs #619, #622, #233