Renamepsaced tests; updated test bootstrap