Fix for unit test failure on ec2