Attempt to fix tests

aaargh current vs latest