Fixes for STMCI tests

Volume test fixes too