Add Fig definition/container classes with tests