Added a couple of initial tests