Make some of these tests work...