Added support for tests checking that a build run did not take longer than expected to finish. Minor stylistic changes.