got all the unit tests to run from either place, fixed some old functionality