Marvin testing

 @MartinSenne 

Please do a quick review & auto-merge. Essentially, I've removed all the commented code,
unused imports and added a skeleton for hazelcast impl.