1314 facets

We can add rest of the facets for next release. I updated the tests and all passed on my machine. For some unknown reason Travis doesn't buildout.