Now have tests for all functions