Commented out tests from Issue #36