split dao mock per test area
add remove gallery feature