Fixing tests by using mktime instead of time to create reservation time
Merge branch 'development' into feature-commands