Fixed tests
ADded provisional operand factory

- @todo: All the operand stuff