Added check for fileinuse in blackhole and dronefactory. Cleaned up tests.