Revert "Et tests, resource fixes"

This reverts commit be23121b6e0a5a9e4390070435c35d129fc79f16.