use factory girl syntax
Update API, add specs