Fix and add tests missing from the test plan

Some tests have not been run, as they were missing from the plan.
Adds them and fixes the ones that broke during.
That's a very common class I believe. This may become very fragile