Model: added resource class and simple test
cleanup