Working version using gulp and tests