Started working on tests. I know, I know..