add polymorphic tests
add belongsTo support
add watch task
update tests