use be_xxx syntax
cleanup of tests