Removed unused/failing tests due to big refactoring.