[yanwei & Dan] refactoring
[Dan & Yanwei] blackout test