adding fixes for bluebottle in order to fix also booking tests - this also contains the changes made by jose' in refaktor - we were working and fixing the same things