Increased timeout interval for tests
Refactoring
Merge pull request #160 from blackhydrogen/resource-timechart

Resource timechart