Code cleanup model test