Added InfoAttribute, more unit tests, not all are passing