Updating to include a lot of test stuff
Update to clean temp files