Fixing lazy lists, adding back to testing.