Enabling some tests #1