Simpler signature handling
Add missing tests
Add test instructions