Add and fix up extras tests