Issue #79, Fix Test errors