Moved the remaining Tag tests under Codeception
Minor corrections to the other tests