tests added/fixed