moved/split/renamed tests to more logical units