Added some initial tests