Updated model and test case

Fixed library to work and pass all tests in latest `lithium`, related to issue #3.