To Models: Made tests and simplified interface