update test scenarios, fix code style #1176