Better tests and now all passing