less aggressive cache busting, updated tests