Various CS updates as well as some additional tests for the unserializer.