exxpand testing, fix a few errors