Tweaked test dependencies.

AsIdentified now has a companion object, which match the tests. The AsIdentified instances are now more useful.