Adjusted rte URL regex and added more factories