Update tests bootstrap for consistent test runs
Update tests to handle xdebug version of int display