Removing fields from Define statements(weird stuff with dotgen, will fix), also added test coverage.