Fix to work test
Add test