Fix tests
Fixes, add specs