Fix two tests. Add new