Committed Lewis' tests, will try to fix.