Fixed some issues executing the test suite for firmware >= 1.0.4