tests  fixed
stable-ish look a little