Working on tests and reforms