Tests reorg as per comments from adrian/cjolif

@wkeese - please review this thoroughly, late night commit and am sure it's not correct