A bit smarter parsing.
Fixed tests according to new package name.