Adding a bunch more test coverage
Everything is now yellow or green...
More vacation test coverage