Added hiding feature. Updated tests