More refactoring, moved JNDI strings to the interfaces
More refactoring and added new test stateful class