Uncomment out 'broken' tests that now work thanks to #120