Revert "Testing Setup"

This reverts commit ddc97eb210179911a25f679bbad8bb2190ccf00c.
Misc Improvements

Made many small improvements. Better running overall.