housekeeping, cleans up deps, fixes some tests