Joined the new moment tests with the already existing moment tests.