Starting to add tests...