Updated tests, Fixed Invalidation patch