Re-added tests and implemented exclusion for Default too