minor comment edit
fixed typos
moved tests according to new testthat convention
partial model support complete