Added test_runtime.py test.
Resolved merge conflicts.