adjust test and tags