Updates for system tests
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino.git