Improve test coverage a lot

Got to a bit where I need to change stuff so putting a little checkpoint in.