some tests
exam and tags tests
fixed merge