Added some new unit tests and more infrastructure so that it's easy to add unit tests for all the policies considered.