Add a more torough test