Adding skills tests. Adding filters & macros