Bugfixes
Add runtime test