Split out RunTests; add tests for ShouldClose
Get all tests passing