use the source
simplify reset steps
fix base test