updated tests, added tags