Remove commented out tests...