Fixed some eastwood warnings - some tests were not actually testing
Fixed some eastwood warnings - now know that declare exists, and I don't have to use def for forward declarations