Fixed unit tests and classloader return value
Merge pull request #2 from jvandesande/UnitTests

Fixed unit tests and classloader return value