Start writing proper unit tests