BVTCK-32 Re-enabling some more tests