attempts at fixing tests