Redo and Clean up some tests
3 files changed