Added tests for runtime package, small style changes