tests and ejb changes