Merge pull request #680 from bhariharan/unstable

Fixing compilation errors
Fix path to test runner