Added masks and macros to test for various types
Added masks and macros to test for various types

emilcondrea/trousers,emilcondrea/trousers,emilcondrea/trousers,Distrotech/trousers,Distrotech/trousers,Distrotech/trousers