Added more tests and implemented last opcode needed