Lots of commented out tests -- concerned?