Fixing acouple failing tests
Fixing a few problems
Delete irrelevant tests