Added omitted tests and minor fixes.