Imporove test framework