- unit tests back in original packages

- integration tests in new packages (names?)