add exercises, reconfigure model tests and add exercise tests