Fix order of operations test, implement pending tests