fixed
separate the logic of the testing setup
updated