Continue to add more tests