Removed some old tests