Adding some initial tests