tests, fixes, v1