PLAYGROUND-84

Unit testing ready !