tests, v1 bug fixes, etc.