Issue 101 - Fix policy tests