Add formatting for tags, Add more tests to cover missing areas

Closes #16