code style change
remove unnecessary tests & test resets