Reworked static model methods and added tests
Update it so tests pass