Move tests, add checked comparison functions