Added test/custom tag for ticket 2