Tests passing. Using grunt intead of make