Rewrote testing to use abstract property evaluation

FixEvent properties still need to be tweaked.