Fixed issues with tests caused by prior commit