Added ability to both the Values and Value tags with full coverage on the functions written