WIP: Cleanup redundant test resources