Added tests for all tags