Clean up dependency and setup test support. (setup test fails because of circular imports)
Attach a file by drag & drop or click to upload
