Reorganizes test folder and increases code coverage