Adjusted code accordingly to latest changes made in test-interface.