OpenLabor minor improvements + test fixes