A few more incremental updates that were uncommitted before
Removing unused test modules