base test template
minor
new signature & fix tests
unify