Test and CI Cleanup