some minor change
Merge branch 'building-models'
delete test dir to get spork work