First shot at implementing tests