Improving services/workbooks

* Take care of workbook updates
* Unit tests

Change-Id: Iae9d13f335b8cca2409ad0731091edbbaa24a271
Merge "Improving services/workbooks"