JUnitTests and Fix of Returntype

Signed-off-by: Christopher Ewest <christookar@web.de>