Move test.cpp to a better place, add fallback in case of no tags