Make snapshot path part of the url and improve tests