Renaming to something more appropiate. Adding serialization tests for CAS queries.