Test tweaks

Just a couple of tweaks to make testing work a little more seamlessly :)