Revert "Remove stuff accidentally merged from features/tests a while ago"

This reverts commit cac670e0db2d218373b9c2fa3199e48d667bb82c.