Added changes to improve the testing environment