add context to statements
fix test count