update refs, fix tests
same