chore: consolidated changes and test suite now works as expected#2506

abose merged 1 commit intomainphcode-dev/phoenix:mainfrom

allChangesphcode-dev/phoenix:allChangesCopy head branch name to clipboard