Fixing tests on dev build