Solved some tests problems after refactoring

git-svn-id: http://jira.uji.es/repos/uji/PORTAL/uji-upo-base/trunk@16749 e6edf6fb-f266-4316-afb4-e53d95876a76