fixed tests and moved all configs together