undoing more stuff and fixing a test