tests updated

Tests still incomplete for all cases