Added more tests and fixed the ones where the interface changed because
of a previous update.