fix tests and make _id an attr on base
more __str__ stuff
merge