Cleaned up test configs for use