removing and adapting tests that don't work with initial sample data

We've got tests that fail with the default system data, this attempts to adapt or update the ones causing an issue on my system.