Added some core models and some tests