really fixing tests