Change Test to Simulator, update makefile