Are all these commented out tests going somewhere?