Modify the existing source-based tests to perform incremental variants too. Now have enough to start fixing bugs.