Remove unused functions and add more test coverage

The docs currently state that this should return an array, but it currently returns a list. Do you have strong feelings on either option?