really fix tests this time