Unit test fixes cf

Fix issues with cloud foundry after building the unit tests