3219 - startup time: 25s with compile, 13s without

(63s to run all tests, 75s with compile)