Clean test program and standardize creation of models