Cleaning up facts, attributes labels . Covering with tests.
Merge pull request #170 from fluke777/master

Cleaning up facts, attributes labels . Covering with tests.