Minor changes to Test model