Updated tests, remove redundant dependency