some fixes so tests are not inter-dependent