update tests

Updated some for subjective scaling
Added simple test of PuLP solver
Other changes to update tests to work with current program