Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client