Instance specific reload file + spec test fixes