Added models & tests