Actually fixing tests this time