Update for clj test and model
Ready