Reworked models and added some tests