Finishing core model unit tests