base tests mostly passed - some more changes