WIP: Factor tests apart into ones that are implementable