Filled in more tests