Added more benchmark tests. Moved some classes to the test-package.