Restoring those commented out unit tests.