Moved test config to separate file + refatoring (better names)