Build changes
Add test
Basis of unit test