#26: update code. fixed tests for ejb.