Tests almost complete