cleaned up cruft and fixed erroring tests