Update tests, add compare to exported