Update tests due to SW-specific changes