Fixed test exception on close, added a few tests, outlined a lot of tests