Gardening. Unskipping and rebasing some passing tests.