Test added
Shorter tests
Test fix