Removed some unnecessary tests no long used