Restore model test code, and add rake task for it