Fixed makefil style, reorganized test directory.