updates to prune unneccessary duplication, additional changes to fixtures