Temporarily replicating processor test fix

Alot of code replication in this commit.