Move tests to correct directory

and make them hopefully system independent