prevent tests to run twice during build, removed redundant tests and unused objects