Moved some tests to other package
Added method to model