Merge "teststeps: Improvements and bugfixing of teststeps"