Refactored samples

Added test runs tags samples