Remove unused helper macro
Remove duplicated expression
Fix copyright year
Add some tests for overlay creation