Adjusts tests for new machine
Fixes for new machine