Fixing tags - starting to write tests