fixed unit and e2e testing