Adding support for multiple invalidation calls (one per path) and some unit tests