Finally Done most of the required testing

This should do as an RC ...