schema draft and modified tests and added classes to models