Extended unittests to 90% coverage
Refactored the pickle loading into a @classmethod
Made some small optimisations to code.