Testing and model corrected and javadocs updated

This version is completely synchronised with the changes of all the
members as of 11/4/2013