cleaned up server backreferences
heavily extended unit tests