more refactoring of test case; adding width/height methods to map.