Some changes due to unit testing in bigcloud