Improved test adaptability
auto-merge staging into master