Updates for testing and profiling.