finally fixed testing
Merge branch 'jacobsen6'

blah
fixed testing