Revert abstract testing for now, do it when there's more time /
resources