added/fixesfor some tests