More extensive session and metric tests

reordered test files