1st attempt at fixing tests