Added Unit Tests  and changed model to corresponding suits
Add shared schemes to have BOTs created