split some tests out into new files