improved consistency, fixed error with switching tests in Test tab