Fixing tests for builds