Removed old and no longer working tests