Moved some tests and completed unimplemented matchers