fixed tests, removed __init__ from model. I prefer using constructors to initialize objects, so I'm going to have to figure out another way to do it.