simplified and cleaned up the test resources