Improved some tests
Merge remote-tracking branch 'origin/feature/fix' into feature/fix