Fixing issues on tests