Add more tests and fixed issue with converting execution TimeUnits
Add more tests