nit it looks like some of these commented out tests need some more changes.