tests work; a lot of other changes