backfilling some much needed tests