ADD CODE MAP AND TEST