Implemented preview feature test

and some feature cleanup in the old feature