Rename context singleton
Cleanup test
Add mapping from collection of objects