Corrected Unit Test functions disturbed by fix for Issue #16