ShapeManager has improved HashMap
Unit tests for ShapeManager