Added extra dependencies. Updated tests