tests fixed and made a little bit faster