Fixed test_add_once
Fixed two failing tests
Merge branch 'master' into dev