Build improvements. Instrumentation tests running.