scj: hwscope test files adapted to new SCJ changes