Working on tests...