WIP: Marking slow tests reworked