Some more tests, some old unused code deleted and deleting the amazing 1+1 test file inflating my test numbers :)