rearranged test folder and modified makefile