Fix tests for two page form
Fixed routing for multiple dots