Fixed some race conditions.
Ran go fmt.
Ensured that server failure test will fail.
v0.6.2

Merge branch 'develop'

* develop:
  Ensured that server failure test will fail.
  Ran go fmt.
  Fixed some race conditions.