DELTASPIKE-487 added sample, simple unit test and bug fixes