Alpha commit 2 (Still missing integration with running tests)