updating tests to work better, still some failures
Merge pull request #26 from tiger-swallowtails-2013/test_updates

updating tests to work better, still some failures