Rename variable
Make sure maps are always initialised
Improve API test