improved testing and makefiles