Add cuke tests form update and delete; BSP'ing
- with some refactoring of the existing cuke tests