modify make file, move test scripts out of EMERC