Start working towards makings sure data is always accurate, even updating data that may be removed

Added some factories and tests. Everything from the data side is fully working now, including removing anything that should be removed