Add in @Override annotations.
Basic input parameter check unit tests.
Simple unit test for user supplement data
Update to latest versions of several plugins
Disable all tests until we work out the proper behaviour.