Improve test coverage. Also, modify Profiler to NOT take the real memory usage.