updates to static & dynamic data classes

updates to testing and errors