Added op's, added more tests