Time for a thorough test to see if I squashed all the PRs Bugs