[FUEL-813] Add provision to CI, tests and small refactoring