- Removed unnecessary code, CS
- Some updates on testrunner code (including fix for issue #263)