Test constructors and add separator comments
Create tests for mapping