Starting to add tests