Added tests for and updated mapControl directive