Swrve 6928 refresh testable

https://swrvedev.jira.com/browse/SWRVE-6928