fix test spec with new routes
refactor the water page in water basic tool