Readded commented out tests