Fixed failing tests
Merge branch 'release/v1.5.0' of github.com:Derkje-J/programming-life into release/v1.5.0