Working on test consolidation...