Add comments
Add tests file