Add test and exit if token not retrieve / Update regex signature