Cleanup
Added resources for core test
Increase timeout for tests