cleanup
update tests to reflect changes in nofactor
merge with master