Edited some old tests to be consistent with the unit test class' attributes, and tested the expand function.
Changed the addMapping method to be a bit more idiomatic python.