Add default configs. Update tests
Remove some overhead