refactoring of label usage and first shrike tests