two tests moved into separate files