all tests passing, but many commented out