Enabling some tests #3