Fixed broken tests, removed codec namespaces.