Catch up a bit on tests an fix bugs caught by them.