Remove query parameters from acceptance specs
Refactor acceptance specs