[test] Re-enabling a disabled test
[minor] Cleaning up tests