Further tests added. Jmock used more extenisvely on server side.