Refactor tests to prepare for testing both full and incremental changes