Fixed tests and removed some dependensies.