got some changes related to testing that missed the last commit due to branch issues