better support for incremental testing