Fixed: test issue + Conn issue + normalize test folder and tests files