Removed tests as they are no more needed