Cleanup/tests

I'd remove this. Unless there is a good reason to have it.
@Danny-Hazelcast ?