Implemented some more operations, and enabled some more tests