Update tests and script to avoid tag creation