Added test targets to makefile; updated simulation target