Cleanup tests and deps
Refactor to microformats2