overhaul
merge to use nengo new tests