restructuring the test folder
failing .. failing .. failing tests ... work in progress