Work on tests. Not finished