Working on tests models