Move some things around, remove some bad tests