Split tests out into several files
Fixed references to force-output