Add in previously stashed tests