Removing duplicate set
Tests should not be in an #ifdef