just made some adjustments to make testing framework code cleaner