More summary optimization; tweaked unit test