fixed some tests where values might not be present