Starting to add some test