Have started implementing tests