Continuing to add more tests