added additional tests and removed un-needed dependencies