Added remaining tests (SUBx)