Merge branch 'pr/10'
Refactored Windows tests.

Signed-off-by: Matthew Boedicker <mboedicker@pivotallabs.com>
Increase timeout for intermittently failing spec.

Signed-off-by: Matthew Boedicker <mboedicker@pivotallabs.com>