Toss in another class to serialize when testing
Fix warnings