Code style and fix part of test not being in the test folder