Split tests out into separate units