Fixing a few things

While trying to fix the unit tests some problems from the redesign
arised (methods with old name, variables not needed, serialization
issues...).