Add underscore
Add extra tests
Move to -specs to fix tests