Adds context class for testing
Adds more resources from old implementation