Added some tests. Added default arguments to some operand types