Completed incorporation of testing setup