Relocated working features to unit tests