Update test structure. Change Makefile structure for executable rename