Further Cleanup, First batch of tests