fixes test flaws