Fix problem where tests crash completely on core branch
Minimize number of tests that fail on core branch.
Merge pull request #61 from abought/test_rework

Test rework