JSR 356 - Improve unit test