Fixed issue that caused inconsistant test behaviour