Adding more stringest tests on tags