FINALIZED new testing setup