Fixing make file tests and include into npm test