Finished up Profiler and test coverage