Fixed issue with failing tests