Adding tests for things that were failing in Tortoise