Removed unused interfaces
Added unit test