api update
updatied the APIs
ensure that templates are also cleared before each test