deps changes
tests, fixes