Fixes on tests0