More fixes to tests, only the static serializations left