Modify Hull Model and Tests