Fixed ocassional test failures
0.4.0