#16 - fixing tests, model changed