sort of fix tests