TODO tasks to reduce configuration

TODO tasks to reduce configuration for tests