Fix demo pages that relied on dataContext leak
change test wrapping
v0.0.24, velocity, fixes #45, #46, #47, relates to #48