Better tests.. more unit-y