Resolved naming conflicts, tests now run

The jboss tests seem to hang.

The name conflicts were when trying to start the old entitymanager tests,
it really did not like the re-use of the name "Doughnut", so I renamed my
classes to use the name "Cookie".