Test missing coverage

Please merge this as it improves coverage, bit far behind dev but no one else seems to have touched the test files this modifies