fix test paths
use new resource style
whitespace
add some family controller tests