Fixed issue with tests