Tighter testing integration

An attempt to tie in more closely to the testing module and the coming remote module.