diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev
index bea40d2d..b37996d6 100644
--- a/pkg/server/.env.dev
+++ b/pkg/server/.env.dev
@@ -1,6 +1,10 @@
-DB_HOST=localhost
-POSTGRES_DB=dnote
-POSTGRES_USER=postgres
+GO_ENV=DEVELOPMENT
+
+DBHost=localhost
+DBPost=5432
+DBName=dnote
+DBUser=postgres
+DBPassword=
 
 SmtpUsername=mock-SmtpUsername
 SmtpPassword=mock-SmtpPassword
diff --git a/pkg/server/.env.test b/pkg/server/.env.test
new file mode 100644
index 00000000..17a64fc7
--- /dev/null
+++ b/pkg/server/.env.test
@@ -0,0 +1,11 @@
+GO_ENV=TEST
+
+DBHost=localhost
+DBPort=5432
+DBName=dnote_test
+DBUser=postgres
+DBPassword=
+
+SmtpUsername=mock-SmtpUsername
+SmtpPassword=mock-SmtpPassword
+SmtpHost=mock-SmtpHost
diff --git a/pkg/server/api/.env.dev b/pkg/server/api/.env.dev
deleted file mode 100644
index 356e7dac..00000000
--- a/pkg/server/api/.env.dev
+++ /dev/null
@@ -1,20 +0,0 @@
-Host=http://127.0.0.1
-Port=5000
-WebPort=3000
-GO_ENV=DEVELOPMENT
-
-DB_HOST=localhost
-POSTGRES_DB=dnote
-POSTGRES_USER=sung
-
-SmtpUsername=mock-SmtpUsername
-SmtpPassword=mock-SmtpPassword
-SmtpHost=mock-SmtpHost
-
-GithubClientID=mock-github-client-id
-GithubClientSecret=mock-github-client-secret
-GoogleClientID=mock-google-client-id
-GoogleClientSecret=mock-google-client-secret
-
-StripeSecretKey=mock-stripe-secret-key
-StripeWebhookSecret=mock-webhook-secret
diff --git a/pkg/server/api/.env.test b/pkg/server/api/.env.test
deleted file mode 100644
index 9342b643..00000000
--- a/pkg/server/api/.env.test
+++ /dev/null
@@ -1,20 +0,0 @@
-Host=http://127.0.0.1
-Port=5000
-WebPort=3000
-GO_ENV=DEVELOPMENT
-
-DB_HOST=localhost
-POSTGRES_DB=dnote_test
-POSTGRES_USER=postgres
-
-SmtpUsername=mock-SmtpUsername
-SmtpPassword=mock-SmtpPassword
-SmtpHost=mock-SmtpHost
-
-GithubClientID=mock-github-client-id
-GithubClientSecret=mock-github-client-secret
-GoogleClientID=mock-google-client-id
-GoogleClientSecret=mock-google-client-secret
-
-StripeSecretKey=mock-stripe-secret-key
-StripeWebhookSecret=mock-webhook-secret
diff --git a/pkg/server/api/handlers/routes.go b/pkg/server/api/handlers/routes.go
index 30ac3004..34b94cd0 100644
--- a/pkg/server/api/handlers/routes.go
+++ b/pkg/server/api/handlers/routes.go
@@ -305,7 +305,7 @@ func applyMiddleware(h http.Handler, rateLimit bool) http.Handler {
 	ret := h
 	ret = logging(ret)
 
-	if rateLimit && os.Getenv("GO_ENV") == "PRODUCTION" {
+	if rateLimit && os.Getenv("GO_ENV") != "TEST" {
 		ret = limit(ret)
 	}
 
diff --git a/pkg/server/api/logger/main.go b/pkg/server/api/logger/main.go
index 8aa9e5fc..9e35e4b9 100644
--- a/pkg/server/api/logger/main.go
+++ b/pkg/server/api/logger/main.go
@@ -35,7 +35,12 @@ func Init() error {
 
 	var endpoint string
 	if os.Getenv("GO_ENV") == "PRODUCTION" {
-		endpoint = "logs7.papertrailapp.com:37297"
+		endpoint = os.Getenv("LogEndpoint")
+
+		if endpoint == "" {
+			log.Println("No log endpoint provided. Not aggregating system logs.")
+			return nil
+		}
 
 		writer, err = syslog.Dial("udp", endpoint, syslog.LOG_DEBUG|syslog.LOG_KERN, "dnote-api")
 		if err != nil {
diff --git a/pkg/server/api/scripts/test-local.sh b/pkg/server/api/scripts/test-local.sh
index d812a97e..12f0b2bb 100755
--- a/pkg/server/api/scripts/test-local.sh
+++ b/pkg/server/api/scripts/test-local.sh
@@ -3,11 +3,10 @@
 # test-local.sh runs api tests using local setting
 set -eux
 
-basePath=$GOPATH/src/github.com/dnote/dnote/pkg/server/api
-
+basePath=$GOPATH/src/github.com/dnote/dnote/pkg/server
 
 set -a
-source "$basePath"/.env.test
+source "$basePath/.env.test"
 set +a
 
-"$basePath"/scripts/test.sh
+"$basePath/api/scripts/test.sh"
diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go
index 0c474935..c2c35118 100644
--- a/pkg/server/database/database.go
+++ b/pkg/server/database/database.go
@@ -34,22 +34,13 @@ var (
 )
 
 func getPGConnectionString() string {
-	if os.Getenv("GO_ENV") == "PRODUCTION" {
-		return fmt.Sprintf(
-			"host=%s port=%s dbname=%s user=%s password=%s",
-			os.Getenv("DBHost"),
-			os.Getenv("DBPort"),
-			os.Getenv("DBName"),
-			os.Getenv("DBUser"),
-			os.Getenv("DBPassword"),
-		)
-	}
-
 	return fmt.Sprintf(
-		"host=%s dbname=%s user=%s sslmode=disable",
-		os.Getenv("DB_HOST"),
-		os.Getenv("POSTGRES_DB"),
-		os.Getenv("POSTGRES_USER"),
+		"host=%s port=%s dbname=%s user=%s password=%s",
+		os.Getenv("DBHost"),
+		os.Getenv("DBPort"),
+		os.Getenv("DBName"),
+		os.Getenv("DBUser"),
+		os.Getenv("DBPassword"),
 	)
 }
 
@@ -69,7 +60,9 @@ const (
 func InitDB() {
 	var err error
 
-	DBConn, err = gorm.Open("postgres", getPGConnectionString())
+	connStr := getPGConnectionString()
+
+	DBConn, err = gorm.Open("postgres", connStr)
 	if err != nil {
 		panic(err)
 	}
diff --git a/pkg/server/database/migrate/main.go b/pkg/server/database/migrate/main.go
index c36dbd98..d87e1417 100644
--- a/pkg/server/database/migrate/main.go
+++ b/pkg/server/database/migrate/main.go
@@ -38,7 +38,7 @@ func init() {
 
 	// Load env
 	if os.Getenv("GO_ENV") != "PRODUCTION" {
-		if err := godotenv.Load("../../api/.env.dev"); err != nil {
+		if err := godotenv.Load("../../.env.dev"); err != nil {
 			panic(err)
 		}
 	}
diff --git a/pkg/server/mailer/templates/.env.dev b/pkg/server/mailer/templates/.env.dev
index 64565a29..a762d8b8 100644
--- a/pkg/server/mailer/templates/.env.dev
+++ b/pkg/server/mailer/templates/.env.dev
@@ -1,6 +1,8 @@
-DB_HOST=localhost
-POSTGRES_USER=sung
-POSTGRES_DB=dnote
+DBHost=localhost
+DBPort=5432
+DBName=dnote
+DBUser=postgres
+DBPassword=
 
 SmtpUsername=mock-SmtpUsername
 SmtpPassword=mock-SmtpPassword