Cleaned up some of the tests, removed the attach/detach test temporarily.