Additional testing updates

Dont worry, I'll rebase.