Add testing
More sophisticated tests
Silence warnings