Fixed broken method and add tests for tags