Moved more tests and operators