SLT-612 cleaned up test code