Fix where we use multiple tags and where not (e.g. not with pytest)

Fix where we use multiple tags and where not (e.g. not with pytest) #33