Add two more spawns, one for unit-tests and another for bdd-tests