diff --git a/.gitignore b/.gitignore
index 60900af..90df8db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ build_config.mk
 var*
 *.log
 bin
-coverage.out
\ No newline at end of file
+coverage.out
+.vscode
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 41fd234..1c03c7f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ export DYLD_LIBRARY_PATH
 export GO_BUILD_TAGS
 export GO111MODULE=on
 
+
+PACKAGES ?= $(shell GO111MODULE=on go list -mod=vendor ./... | grep -v /vendor/)
+
 all: build
 
 build:
@@ -26,7 +29,7 @@ vet:
 	go vet -mod=vendor -tags '$(GO_BUILD_TAGS)' ./...
 
 test:
-	go test -mod=vendor --race -tags '$(GO_BUILD_TAGS)' -cover -coverprofile coverage.out -timeout 2m $$(go list ./... | grep -v -e /vendor/)
+	go test -mod=vendor --race -tags '$(GO_BUILD_TAGS)' -cover -coverprofile coverage.out -timeout 10m $(PACKAGES)
 
 clean:
 	go clean -i ./...
diff --git a/README.md b/README.md
index cb42414..7e7b979 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # LedisDB 
 
-[![Build Status](https://travis-ci.org/ledisdb/ledisdb.svg?branch=develop)](https://travis-ci.org/siddontang/ledisdb) 
-
-[![codecov](https://codecov.io/gh/ledisdb/ledisdb/branch/master/graph/badge.svg)](https://codecov.io/gh/ledisdb/ledisdb)
+[![Build Status](https://travis-ci.org/ledisdb/ledisdb.svg?branch=develop)](https://travis-ci.org/siddontang/ledisdb) [![codecov](https://codecov.io/gh/ledisdb/ledisdb/branch/master/graph/badge.svg)](https://codecov.io/gh/ledisdb/ledisdb)
 
 Ledisdb is a high-performance NoSQL database, similar to Redis, written in [Go](http://golang.org/). It supports many data structures including kv, list, hash, zset, set.