Restructure tests and scripts, until unit tests run successfully
Make E2E test pass