Re-enabling some commented out test code.