Change unittest buildInstr to buildSAddo/buildSSubo
Change some EXPECT_TRUE to EXPECT_EQ
Flip argument order of EXPECT_EQ for better failure messages