Add more tests
Fix removing resources form kwargs