another attempt at fixing tests